From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Tue, 2 Oct 2012 19:02:59 +0000 (+0200)
Subject: NetworkMenu: don't notify for failed connections if cancelled by the user
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5327
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6b1e6326219d323a0b52378cf7620078e2903645;p=gnome-shell.git

NetworkMenu: don't notify for failed connections if cancelled by the user

If the user cancels the secret dialog, the NM will report the connection
failure, but we should not notify it as it is a user-initiated action.

https://bugzilla.gnome.org/show_bug.cgi?id=684823
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 9da066dab..e355415cb 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -574,7 +574,11 @@ const NMDevice = new Lang.Class({
             this.emit('network-lost');
         }
 
-        if (newstate == NetworkManager.DeviceState.FAILED) {
+        /* Emit a notification if activation fails, but don't do it
+           if the reason is no secrets, as that indicates the user
+           cancelled the agent dialog */
+        if (newstate == NetworkManager.DeviceState.FAILED &&
+            reason != NetworkManager.DeviceStateReason.NO_SECRETS) {
             this.emit('activation-failed', reason);
         }
 
@@ -1540,7 +1544,8 @@ const NMVPNSection = new Lang.Class({
     },
 
     _connectionStateChanged: function(vpnConnection, newstate, reason) {
-        if (newstate == NetworkManager.VPNConnectionState.FAILED) {
+        if (newstate == NetworkManager.VPNConnectionState.FAILED &&
+            reason != NetworkManager.VPNConnectionStateReason.NO_SECRETS) {
             // FIXME: if we ever want to show something based on reason,
             // we need to convert from NetworkManager.VPNConnectionStateReason
             // to NetworkManager.DeviceStateReason